//
//  ViewController.m
//  GitTest
//
//  Created by xalo on 16/4/27.
//  Copyright © 2016年 xalo. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController

- (void)viewDidLoad {
    [super viewDidLoad];
    //Ajslkdjfasdmjmzilmazmanvmaomlxmsjoajsf
    // Do any additional setup after loading the view, typically from a nib.

    // 测试冲突 咔咔就发 撒旦法师打发斯蒂芬
    //我要修改了数量单价法；圣诞节发放
    // 测试冲突 咔咔就发
    //我要修改了 第二次冲突
    SecondViewController *secondVC = [[SecondViewController alloc] init];
    [self presentViewController:secondVC animated:YES completion:nil];
}

- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}

@end
